From 8b0d4a0eefdc1a388571d91776fa8a8dbf8a80d1 Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Tue, 15 Dec 2020 14:37:55 -0700
Subject: [PATCH] backward compatible changes for Qt6 (#656)

* Avoid implicit conversion of int to QChar.

In Qt6 the constructor QChar(int code) is explicit by default.

* update codacy coverage reporter

* move coverage generation to focal.

* use binary codacy coverage reporter
---
 .travis.yml                        | 2 +-
 mmo.cc                             | 2 +-
 tools/travis_script_linux_coverage | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 200412234..0f0f054b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,7 +91,7 @@ jobs:
           - $HOME/Cache
         timeout: 600
     - os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc
       env:
         - BUILD_TYPE="coverage"
diff --git a/mmo.cc b/mmo.cc
index de303431a..2dd973d60 100644
--- a/mmo.cc
+++ b/mmo.cc
@@ -929,7 +929,7 @@ mmo_finalize_rtept_cb(const Waypoint* wptref)
 {
   auto* wpt = const_cast<Waypoint*>(wptref);
 
-  if ((wpt->shortname[0] == 1) && (wpt->latitude == 0) && (wpt->longitude == 0)) {
+  if ((wpt->shortname[0] == '\01') && (wpt->latitude == 0) && (wpt->longitude == 0)) {
     mmo_data_t* data;
     Waypoint* wpt2;
 
diff --git a/tools/travis_script_linux_coverage b/tools/travis_script_linux_coverage
index 925b6972a..8cd6bd42f 100755
--- a/tools/travis_script_linux_coverage
+++ b/tools/travis_script_linux_coverage
@@ -17,8 +17,7 @@ make -j 3 coverage
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 if [ -v CODACY_PROJECT_TOKEN ] ; then
   # upload coverate report to codacy.
-  wget -nv -c https://github.com/codacy/codacy-coverage-reporter/releases/download/6.2.0/codacy-coverage-reporter-assembly-6.2.0.jar
-  java -jar codacy-coverage-reporter-assembly-6.2.0.jar report -l cpp -f -r gpsbabel_coverage.xml
+  bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l CPP -r gpsbabel_coverage.xml
 else
   echo "Skipping codacy coverage upload as CODACY_PROJECT_TOKEN is not set."
 fi
-- 
2.30.2